Refreshed patches

diff --git a/debian/patches/02-rtmidi-pkgconfig.patch b/debian/patches/02-rtmidi-pkgconfig.patch
index 9ee972c4acdc394887be4ff228fca48a49a18693..467dd987e6a1d32e8545218c7f491e53ba1a843b 100644 (file)
--- a/debian/patches/02-rtmidi-pkgconfig.patch
+++ b/debian/patches/02-rtmidi-pkgconfig.patch
@@ -2,11 +2,9 @@ Description: build with new rtmidi lib.
 Author: James Cowgill <jcowgill@debian.org>
 Forwarded: <giadaloopmachine@gmail.com>
 
-Index: giada/Makefile.am
-===================================================================
 --- giada.orig/Makefile.am
 +++ giada/Makefile.am
-@@ -283,9 +283,9 @@ if LINUX
+@@ -285,9 +285,9 @@
  giada_SOURCES += src/deps/rtaudio-mod/RtAudio.h src/deps/rtaudio-mod/RtAudio.cpp
  # -Wno-error=unused-function: don't stop on JUCE's unused functions
  giada_CXXFLAGS += -Wno-error=unused-function
@@ -18,7 +16,7 @@ Index: giada/Makefile.am
    -lfreetype
  endif
  
-@@ -372,7 +372,7 @@ src/deps/juce/modules/juce_gui_extra/juc
+@@ -374,7 +374,7 @@
  endif
  
  giada_tests_LDADD = -ljansson -lsndfile -lsamplerate -lfltk -lXext -lX11 -lXft \
@@ -27,11 +25,9 @@ Index: giada/Makefile.am
    -lfreetype
  
  giada_tests_CXXFLAGS = -std=c++11
-Index: giada/configure.ac
-===================================================================
 --- giada.orig/configure.ac
 +++ giada/configure.ac
-@@ -118,13 +118,7 @@ AC_CHECK_HEADER(
+@@ -118,13 +118,7 @@
  )
  AC_LANG_POP
  

diff --git a/debian/patches/04-catch.patch b/debian/patches/04-catch.patch
index 4ce2654ff89eaf657a23bcabe7bf384dfe62b30d..543115f5725784ecfea9f3448871821013c2f2c4 100644 (file)
--- a/debian/patches/04-catch.patch
+++ b/debian/patches/04-catch.patch
@@ -2,8 +2,6 @@ Description: test with system-wide catch.
 Author: Jaromír Mikeš <mira.mikes@seznam.cz>
 Forwarded: no
 
-Index: giada/tests/main.cpp
-===================================================================
 --- giada.orig/tests/main.cpp
 +++ giada/tests/main.cpp
 @@ -1,3 +1,3 @@
@@ -11,8 +9,6 @@ Index: giada/tests/main.cpp
  #define CATCH_CONFIG_FAST_COMPILE
 -#include "catch/single_include/catch.hpp"
 +#include <catch.hpp>
-Index: giada/tests/conf.cpp
-===================================================================
 --- giada.orig/tests/conf.cpp
 +++ giada/tests/conf.cpp
 @@ -1,6 +1,6 @@
@@ -23,8 +19,6 @@ Index: giada/tests/conf.cpp
  
  
  using std::string;
-Index: giada/tests/midiMapConf.cpp
-===================================================================
 --- giada.orig/tests/midiMapConf.cpp
 +++ giada/tests/midiMapConf.cpp
 @@ -1,6 +1,6 @@
@@ -35,8 +29,6 @@ Index: giada/tests/midiMapConf.cpp
  
  
  using std::string;
-Index: giada/tests/patch.cpp
-===================================================================
 --- giada.orig/tests/patch.cpp
 +++ giada/tests/patch.cpp
 @@ -1,6 +1,6 @@
@@ -47,8 +39,6 @@ Index: giada/tests/patch.cpp
  
  
  using std::string;
-Index: giada/tests/recorder.cpp
-===================================================================
 --- giada.orig/tests/recorder.cpp
 +++ giada/tests/recorder.cpp
 @@ -1,6 +1,6 @@
@@ -59,8 +49,6 @@ Index: giada/tests/recorder.cpp
  
  
  using std::string;
-Index: giada/tests/utils.cpp
-===================================================================
 --- giada.orig/tests/utils.cpp
 +++ giada/tests/utils.cpp
 @@ -1,6 +1,6 @@
@@ -71,8 +59,6 @@ Index: giada/tests/utils.cpp
  
  
  using std::vector;
-Index: giada/tests/wave.cpp
-===================================================================
 --- giada.orig/tests/wave.cpp
 +++ giada/tests/wave.cpp
 @@ -1,6 +1,6 @@